Backport r104485 (Bug#8799) from trunk
authorChong Yidong <cyd@stupidchicken.com>
Sun, 21 Aug 2011 03:12:26 +0000 (23:12 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 21 Aug 2011 03:12:26 +0000 (23:12 -0400)

Trivial merge